Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 23 Jan 2010 11:46:15 +0000 (11:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 23 Jan 2010 11:46:15 +0000 (11:46 +0000)

Trivial merge